Add per-site GutenbergKit opt-in and announcement bottom sheet#22813
Draft
jkmassel wants to merge 5 commits into
Draft
Add per-site GutenbergKit opt-in and announcement bottom sheet#22813jkmassel wants to merge 5 commits into
jkmassel wants to merge 5 commits into
Conversation
Collaborator
Generated by 🚫 Danger |
Contributor
|
|
Contributor
|
|
Contributor
🤖 Build Failure AnalysisThis build has failures. Claude has analyzed them - check the build annotations for details. |
Surfaces the new GutenbergKit editor to users ahead of its default rollout. Adds a one-time announcement bottom sheet on app start and a per-site toggle in Site Settings to opt in or out. Gated on the remote feature flag and skipped for sites where the block editor is disabled.
The announcement bottom sheet now sets a single app-wide opt-in instead of a per-site flag. The Site Settings toggle becomes a tri-state override (opt-in / opt-out / follow global), stored as two StringSets so absence means "follow global." Resolution: siteOverride ?? globalOptIn, still gated by the experimental, remote, and kill-switch flags.
SiteUtils.isBlockEditorDefaultForNewPost is now @deprecated in favor of SiteSettingsProvider.isBlockEditorDefault; inject the provider into the view model and route the announcement gate through it. Restore the GutenbergKitFeatureChecker field on SiteSettingsFragment that was dropped during conflict resolution against trunk's new EditorCapabilityResolver block.
jkmassel
force-pushed
the
jkmassel/gutenbergkit-opt-in
branch
from
f580ae7 to
1ff1259
Compare
Add javadocs to the per-site override read/write pair, the underlying StringSet helpers, and the global opt-in + announcement-shown getters and setters so callers can pick the right primitive without re-reading the implementation.
The Theme Styles and Third-Party Blocks gates short-circuited on isGutenbergKitEnabled() with no site argument, so the resolver only saw the global opt-in and ignored per-site overrides. The launcher, which uses the site-aware overload, could open GBKit for a site opted in locally while the resolver still reported Hidden — the editor would then run without those capabilities applied. Pass site through to the checker so both gates use the same view of "is GBKit on for this site" that the launcher does.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
AppPrefs.EditorLauncher.isGutenbergKitRemoteFeatureEnabled) and suppressed for sites where the block editor isn't the default (viaSiteUtils.isBlockEditorDefaultForNewPost).Changes
GutenbergKitAnnouncementBottomSheetFragment+gutenberg_kit_announcement_bottom_sheet.xml: New bottom sheet. Consumes top window insets so Material'sBottomSheetDialogdoesn't double-pad under the status bar. Inline "Learn more"ClickableSpanopens a web page viaWPWebViewActivity.WPMainActivityViewModel: NewcheckAndShowGutenbergKitAnnouncement(site)— gated on remote flag, one-shot pref, non-null site, andSiteUtils.isBlockEditorDefaultForNewPost(site).WPMainActivity: Observes the announcement event and shows the fragment.GutenbergKitFeatureChecker:FeatureStatenow carriesisEnabledForSite;getFeatureState/isGutenbergKitEnabledaccept an optionalSiteModel.@JvmOverloadsadded for Java interop. NewisGutenbergKitRemoteFeatureEnabled()for opt-in surfaces.SiteSettingsFragment: New preference wired toAppPrefsWrapper.isGutenbergKitEnabledForSite/setGutenbergKitEnabledForSite. Visibility gated by the remote flag.AppPrefs/AppPrefsWrapper: AddsGUTENBERG_KIT_ANNOUNCEMENT_SHOWNand the per-site opt-in key.EditorLauncher: Passes the current site into the feature check so the per-site opt-in is honored.Test plan
mobileEditor == "aztec"): announcement sheet does not appear.WPMainActivityViewModelTest,GutenbergKitFeatureCheckerTestpass.